MDEV-35810 test log_file_size_online fixup

A KILL QUERY of SET GLOBAL innodb_log_file_size would sometimes lead to
ER_QUERY_INTERRUPTED being reported.

This also fixes MDEV-38287 that was visible on Launchpad.net ppc64el and
s390x builders.

Origin: https://github.com/MariaDB/server/commit/8794f8c3d7e1a7dd8e1e2f8c93298ff3f8dbef95

Gbp-Pq: Name MDEV-35810-test-log_file_size_online-fixup.patch

diff --git a/mysql-test/suite/innodb/t/log_file_size_online.test b/mysql-test/suite/innodb/t/log_file_size_online.test
index fb6722ee8d76e70dab271342c00779b0f7182044..8ea5e662d3b00178008bbdf69f2c99e43fea4993 100644 (file)
--- a/mysql-test/suite/innodb/t/log_file_size_online.test
+++ b/mysql-test/suite/innodb/t/log_file_size_online.test
@@ -43,6 +43,7 @@ send SET GLOBAL innodb_log_file_size=7340032;
 let $ignore= `SELECT @id := $ID`;
 KILL QUERY @id;
 --connection con1
+--error 0,ER_QUERY_INTERRUPTED
 reap;
 
 --connection default